Skip to content

merge conflict fix v2 - #21

Open
owais12-lgtm wants to merge 2 commits into
hackclub:masterfrom
owais12-lgtm:master
Open

merge conflict fix v2#21
owais12-lgtm wants to merge 2 commits into
hackclub:masterfrom
owais12-lgtm:master

Conversation

@owais12-lgtm

Copy link
Copy Markdown
Contributor

fixed the stuff that got nuked by the merge conflict and updated prices + added new prizes

@vercel

vercel Bot commented Sep 8, 2026

Copy link
Copy Markdown

@owais12-lgtm is attempting to deploy a commit to the Hack Club Team on Vercel.

A member of the Team first needs to authorize it.

@owais12-lgtm owais12-lgtm changed the title Add new shop items and update item prices merge conflict fix v2 Sep 8, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant